Removed moved classes