Initial work for sandbox reorganization

This is the initial work for the reorganization of the sandbox. See #544.

/c @mtitolo 
This seems unintentional.