More moving
Revert "More moving"

This reverts commit 3b4f9472364ffc9bcc57188161dee29f6cb1ff1d.
Merge branch 'master' of https://github.com/emoon/ProDBG