Moved and modifed some classes