Moved subclasses out of project