Refactor Kik into subproject