Moved to modularity

Modularity