Refactored directory structure
More ora work