Added bean interface and minor package renaming