Working on new check entities

Main goals: 
- Merging check entities with objects used for webservices.
- Cleaning code