renaming/reintegrating angular parts