Fix dependency,filenames and typos