fix package, imports, login