Refactored directory structure to be clearer