Restructure the package, update README