Cleaned up files and file names.
Added more stuff.