Adding async streaming support; cleaning up read parsing
Consolidating files and cleaning up comments