shrinking namespaces, preparing for squish