fix organization of files