Put utils sub-module under services namespace
Alphabetize module definitions

Except for “app”, which is at the bottom
Merge branch 'consolidate-services'