Cleaned up the mess.
Made it modular and more Camel way.