cleaner organization/naming for field set angular modules