Refactor the sandbox modules