Removed old files. More consistent indenting.