Made seperate classes. Moved XML file