Remove & sort. System directives should come at the top, and update MessagesLoops.cs file name