Moving to a more appropriate package