Restructuring the directory structure