Re-organised, so demo is in separate dir and library in root. For clarity