File structure clean up <Deepan>