New angular structure, added routing