Moving config to folder
Merge branch 'master' of https://github.com/sgudjonsson/project-structure