Major refactoring to combat splitter (use class-method template). Renamed entities.