Version bump and change package structure