changed the order of included files and uncommented video streamer