more reconfiguring due to file restructure