Changed file structure and renamed some files.