Update Complete Refactoring Code. Work on Modularity