fixing how demo includes classes
also fixes naming issues
Merge branch 'release/0.0.1'