restructure package into package by feature
completed entity mapping annotations