geeksams refactoring example a adapted to our devenv and some refactoring attempts as branches