Refactored directory structure to support maven builds