Move the structures to use AngularJS