See comment above about making revo/attitude.c the "main" one.  No need to refactor this if it really is legacy code.