Moved some classes
Removed old unmoved classes
fixed conflict
fixed conflict... AGAIN, OKEYAEY
fixed conflict... again version 2
Merge branch 'dev' of https://github.com/totteCh/B17 into dev