middle of reorganisation
Various refactoring and fixes
fix gemspec