Refactors directory structure