folder organisation and adding sandbox