Added CDI example. Cleaned up some files