replaced module file structure, working Autofill