a lot of clean-up. Better maven stuff. added missing files.