More project refactoring.
Merge branch 'master' of ssh://github.com/Tarinaky/Roentgen