changed classes names to fit better their use + renamed demos