Moved some classes into production code