Restructure nearly complete

Mostly in Angular - need to work on integrating socket again