refactored directory structure of repo