Reversion of startup scripts move

After discussion, the original config was though to be less confusing