Re-structure files a little
Merge branch 'master' of https://github.com/thomassjogren/itcog