Moving around some files; extract out constants and Facility class.  Work on primitiveHashMap to allow for reflection to simplify code.