patched marionette with jamjs
fixed things and reordered directory tree