Updated folders structure