Remove sandbox module
Small refactoring in order to increase modularity