Skeleton code for beans/refactorings

Fix typo in package name for datastore and also add skeleton code for
beans.
Remove old typo'ed package files