cleanup, reorganization and a tiny little version bump