restructure header files; move non config lines away from mrbconf.h