initial cdi support
package renaming - refactor