Changed to the new folder structure