Move directives to directive folder
Refactore services code style