refactored directory structure of units