restructure, use latest marconi from GH
can now skip unit tests