Changed Entity structure
Changed packages structure