Cleaning up directory structure

Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>