small changes, directory restructuring