Update to new directory structure