major refactoring of the sandbox bundle