Refactor Golag dir creation