Reorganize the package structure
bumped version