Moved some of the files into folders and added icons to some of the buttons