Improved strcuture of xcake in preperation for specs and documentation.
Fix conflict.