cleanup and first entity
some refactor
07:04