Moved stuff around.
Merge branch 'develop' of https://github.com/nxkit/nxkit.git
Removed