Rearranged start scripts and added additional user XML files