Keep refactoring, move commen methods to lib packages, move demo code to
demo packages