Added additional test cases and resolved a but, then restructured packages