POMs cleaned out.  Non-Maven like layout should eventually change.