Remove some classes and start to reorganizing data model