filename and directory restructuring