Hotfix/15 remove unit dir