Mudulized the project

I will look at the last bit of testing and the bug you reported on the heroku app tomorrow