restructure code, update angular modules