swimmer refactoring, W.I.P.
Merge branch 'master' of https://github.com/steveoro/goggles