hopefully final directory restructuring