Split services.yml into multiple files (Closes #34)