More Crowd refactoring
More refactoring and cleanup of the Crowds namespace