restructuring files to run on odyssey