Fixed it up with angular modules