Dirs Refatoring