less magic with setting the path, structure cleanup
version bump