remove function-based creation. pull classes up one level.