Renamed types, started formatter
Merge branch 'master' of git@github.com:lbovet/wtype.git