angular structure
Fixed merge conflicts

Signed-off-by: warri93 <melissa.warrens@gmail.com>