Made some more changes, renamed some files.