Refactored package names to reflect that this is the core library.