1) Extract EntityBase class
2) Refactor package structure