Changed internal module structure to use an Ordered Dictionary