Try to make the project more modular