Restructuring directory tree