Fix build issues with moving to new directory structure