re-structure folders ready to start