Fix modular not working.  Move it to device configs and include it before main.mk:

Also now all device module configs must come before main.mk