Restructuring old directory structure