Cleanup of tests and package structure.  Theories working as intended