Moved functions in window to logical location
Merge branch 'master' of https://github.com/thumaszz/ccore