Re-factored package for shorter future naming