Restructured packages
Made first test in PrimalIntegrationTest pass