Added more changes in folders structure
Added more folders changes