Revert to Elastical for now, but in-line the package so that it supports basePaths
Added basePath to allow overriding