-Merged my part and david's

-separated each component into its own xml file