Restructured beans package file to fit the file structure in general.