Index: head/lang/alchemist.el/Makefile
===================================================================
--- head/lang/alchemist.el/Makefile	(revision 395138)
+++ head/lang/alchemist.el/Makefile	(revision 395139)
@@ -1,29 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	alchemist.el
-PORTVERSION=	1.4.0
+PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Elixir Tooling Integration Into Emacs
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	elixir-mode.el>=0:${PORTSDIR}/lang/elixir-mode.el
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tonini
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_EMACS=	yes
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/server
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/server/*.exs ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/server
+	${INSTALL_DATA} ${WRKSRC}/alchemist-server/*.exs ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
+	${INSTALL_DATA} ${WRKSRC}/alchemist-server/lib/*.exs ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/lang/alchemist.el/distinfo
===================================================================
--- head/lang/alchemist.el/distinfo	(revision 395138)
+++ head/lang/alchemist.el/distinfo	(revision 395139)
@@ -1,2 +1,2 @@
-SHA256 (tonini-alchemist.el-v1.4.0_GH0.tar.gz) = a054134e4e7b48c67e1919d447fc99b4894d506be74a1dc5ee8054a276f8fec3
-SIZE (tonini-alchemist.el-v1.4.0_GH0.tar.gz) = 1718209
+SHA256 (tonini-alchemist.el-v1.5.0_GH0.tar.gz) = 7d81b49e8ff88f9b884752da557420fcf90cf8aa3f26d6d4d0c5206766ba53f9
+SIZE (tonini-alchemist.el-v1.5.0_GH0.tar.gz) = 1720597
Index: head/lang/alchemist.el/pkg-plist
===================================================================
--- head/lang/alchemist.el/pkg-plist	(revision 395138)
+++ head/lang/alchemist.el/pkg-plist	(revision 395139)
@@ -1,31 +1,30 @@
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/alchemist-refcard.pdf
 %%PORTDOCS%%%%DOCSDIR%%/alchemist-refcard.tex
 %%EMACS_SITE_LISPDIR%%/alchemist-company.el
 %%EMACS_SITE_LISPDIR%%/alchemist-compile.el
 %%EMACS_SITE_LISPDIR%%/alchemist-complete.el
 %%EMACS_SITE_LISPDIR%%/alchemist-eval.el
 %%EMACS_SITE_LISPDIR%%/alchemist-execute.el
 %%EMACS_SITE_LISPDIR%%/alchemist-goto.el
 %%EMACS_SITE_LISPDIR%%/alchemist-help.el
 %%EMACS_SITE_LISPDIR%%/alchemist-hooks.el
 %%EMACS_SITE_LISPDIR%%/alchemist-iex.el
 %%EMACS_SITE_LISPDIR%%/alchemist-message.el
 %%EMACS_SITE_LISPDIR%%/alchemist-mix.el
 %%EMACS_SITE_LISPDIR%%/alchemist-project.el
 %%EMACS_SITE_LISPDIR%%/alchemist-refcard.el
 %%EMACS_SITE_LISPDIR%%/alchemist-report.el
 %%EMACS_SITE_LISPDIR%%/alchemist-scope.el
 %%EMACS_SITE_LISPDIR%%/alchemist-server.el
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/case.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/completer.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/documentation.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/informant.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/server.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/source.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/run.exs
 %%EMACS_SITE_LISPDIR%%/alchemist-test-mode.el
 %%EMACS_SITE_LISPDIR%%/alchemist-utils.el
 %%EMACS_SITE_LISPDIR%%/alchemist.el
-%%EMACS_SITE_LISPDIR%%/server/case.exs
-%%EMACS_SITE_LISPDIR%%/server/completer.exs
-%%EMACS_SITE_LISPDIR%%/server/documentation.exs
-%%EMACS_SITE_LISPDIR%%/server/informant.exs
-%%EMACS_SITE_LISPDIR%%/server/run.exs
-%%EMACS_SITE_LISPDIR%%/server/server.exs
-%%EMACS_SITE_LISPDIR%%/server/source.exs
-%%EMACS_SITE_LISPDIR%%/server/utils.exs