Split up class objects. Reverted some classes to prototype pattern for consistency.