More refactoring, verify basic functionality

- [x] Multi-lang support #1 
- [x] Site data