Cleaning up project into modules