more file restructure