fixed include
updated apps
fixed class name
more includes