Reorganization, Logger, FpsCounter, Moved State/Resource Identifiers