Moved panels to seperate classes. Somewhat tidied some of the main classes