Restructing directory structure