Fix repository name and imports, improve code structure#57

paskal merged 1 commit intomasterukeeper/ukeeper-readability:masterfrom

generic-updatesukeeper/ukeeper-readability:generic-updatesCopy head branch name to clipboard