Modularization of the project