Moved classess around