Moved classes to schemas