Moved classes for better alignment