Chenged to the new directory structure