Increasing modularity

Increasing modularity