Restructured the directory tree