Refactored projects and added CDI support.