Reorganize build.
wip
wip
big refactor of build
Fix the build
AuthenticateeServlet wip