Final fixes for customizer given the new directory structures.