refactored directory structure to a standard maven structure