Reorganized
Merge branch 'master' of https://github.com/jontturi/TopDOWNunder, fix reorganisation