- Preparations for future improvements (rewrote many classes to Kotlin)