Cleaned up modules to reflect centralizing auth