some restructuring
Merge branch 'master' of github.com:muuankarski/avointiede2013