- move entity implementations to the separate package
- code formatting
- cleanup