Removing the external modules.
Made some minor chnages.