Tidied up

Files tidied up, removing unnecessary classes, adding foreground and
background class. Now moving on to menu.