Project restructured for conventional library build. Demo fixed.