pre10.3 folder reorganization part 1

pre10.3 folder reorganization part 1