Added Angular routing to get better separation