Correcting directory structure and naming
Correcting directory structure and naming