Moving files and updating include locations, makefiles, and few initialization errors.