Corrected Makefiles, added source for console object