fixing how demo includes classes
also fixes naming issues