refactor sandbox
Refactor architecture