updated dir structure
Removing old dirs