Refactor
Also add LlamaKit project back so that stuff works in AppCode, hopefully