Refactored directory hierarchy to be more readable