refactoring
Merge pull request #1 from lukaselmer/new-folder-structure-refactoring

refactoring