Renamed some files and added custom data streaming