Move stuff, add user splices, simplify some peaces.
Merge branch 'master' of https://github.com/Zenol/kiwimanager