* refactored directory structure