merged base code with chrome extension files