Refactored the Crowd files