Done changes for angular modules setup