file restructure slightly