Merge pull request #360 from parrt/master

mv to runtime. damn git! Seems that it might delete but not move files. hmm...
merge upstream