Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
I believe they're already listed in groups based on what they deal with in the header file. Can you describe what you mean?