Clean: Moved some classes to more appropriate classes (trying that again)