Reorganize the OF-Config logic modules

Includes -include fixes for linc_us3.