Better modularize the project.