Changed Makefiles to put modules in root dir.