WIP: Entity refactor. Remove unused files.