- Moved to single js
- Small refactorings