Update application structure. Change streams to stream and begin building out further structure of components etc