Refactored daos and spring controllers. Small rearrangements in packages area.