More refactoring
Removed files
meh
Merge branch 'dev'