Restructuring of directories in preparation for adding the 2nd tab.