Fixed entity classes && project structure