Correct Services dir, move ordering of touchforms starting