Relocate source files to conform to 147 build env