Rearranged files for cleaner access
Merge branch 'feat1'