Refactor of low level dax folder.