rebuilt angular skeleton with angular-generator