hierarchy minor changes

minor folder hierarchy and file naming changes