Fix build errors.
Remove redundant test.
Making sensible packages #1 - some tests pass.
Making sensible packages #2.
Making sensible packages #3.
Making sensible packages #4.
Making sensible packages #5.
Making sensible packages #6. All tests pass.