Initial stages of stream restructuring
Cleaned up streaming server
Merge branch 'feature/stream-restructure' into develop