Re-arrange dir structure to use opal/ dir