Rework file structure. Create entity-builder. Add functions to entities.