finished modularization of the project and cleaned up a bit