Redid the structure to make it work in eclipse, fixed failing unit tests.