New files ; change classes to correct packages
Update to camel-server 0.4.0