Removed over-engineered StreamSource bit. Renamed device package to def