demos working as before with new build system, and javelin split into packages