- Basic Code refactoring
- Alignment of src files
- More api classes ported based on Java API