first commit...
changed structure, added cdi
fixed bugs