* modules.h, modules.c: Moved around a lot of code so that