Moved lots of files and created new module structure
camel builds correctly
First integration functional
Integration smoothed