changed structure to use mostly angular for layout and routing