Changed organization of files.