Updated file structure for 1.5.