Moved data to a seperate class, and reorgansed other areas