refactored directory structure. better naming conventions.