Hotfix/18 remove unit dir