modified package & bean file structure, and improved the logout handling.