Change package prefix

Fix #2 and #4