moved to demo specific directory
Added the CDI sample. Removed the events (until proper demo) and made some small changes