lot of changes to webapp package, mostly around login, also to structure