separate library classes from demo