JLANGX-11 move VanillaMapped stuffs out of the sandbox