Reorganized ALL THE THINGS
Angular stuff