Remove demos. Refactor Fluid to be clearer, more consistent.