Package names more appropriate for inclusion as library, and match folder structure