more changes before file restructuring