Refactored database, DB entities, DAOS, tests and various services to match some of the new requirements. Still have a lot to complete. Busy with the location replacement