Updated to standard maven structure