Change directory structure

Align Directory structure to align Restructured solution