- Refactor: Relocate inline class into own file