minor changes to organization of files