Feature/improve organization of services