renamed some services + started adding xml parsing