renaming directory structure as per convention, Dev Task : STORM-44