Group files by feature, not type
Merge branch 'featureFolderStructure'