declare modules in init file
add init file at the top
move services in their own modules