restructuring angular module