Reorganise folder structure into a more manageable format for refactoring
Merge pull request #1 from tommeier/fix-folder-structure

Reorganise folder structure into a more manageable format for refactoring