minor file riorganization