Refactoring services, moving things from start.sh to self-standing yml files, fixups for etcd timing
Fixing service order dependencies