Mayhem - more reorganization

Continued to work on getting the code more in line with how Armada has
been ordered.