partial commit for rahul to passon structure change of route folder
resolved pull merge conflicts