Change structure of project and fix require statemets

Now everything is in folders