Move service definitions to subdirectory