moving stuff around
Merge pull request #2 from CROMBi-kk/kk4.4

moving stuff around