Code cleanup I.
Add new control file module and test file.