- Adding mapper
- Adding queries
- Moving classes