Move entity classes to separate directory