Fix retain package structure flow where nested directory at root level were lost

Fix retain package structure flow where nested directory at root level were lost #819