restructured angular