Moving things into folders
Merge branch 'refactor'
Fix refactor merge