Redesigningkirti

@Chirag please merge my branch with yours and let us carry that final structure forward before doing any more development work.