minor updates, directory restructuring