Neatened up some stuff, renamed files to conventional names and aligned some text etc.