Sandbox re-configuration / directory re-structuring:2