Changed organization of files