Renaming method to be clearer in its function.
Making the in memory container better structured.
Renaming packages for consistency.
Continuing renaming of packages and sorting of objects.
Renaming type parameters and a couple methods for clarity.