Making the Project modular