Adopt new blueprint dir structure