Refactored BRS into modules