Work on refactoring methods in Core.java to include class names for
better namespacing.