Scanner refactoring
Removed stream.js
Refactoring