Rearranged package elements

Tests pass locally