bugfix and rename package