reorganization of the angular structure. Added new bookmark modal functionality.