moving some stuff around.
Merge pull request #6 from Zombi-X/kk4.4

merge into master