Modularized the project - Issue #1

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