Make the project more modular