small refactoring - service and storage (dao) layers has been created

Change-Id: Ia3c106bfbe87a7e9c08659fd61308164b9afb2dc