SOLID - Moved classes to OK