more file restructuring