Refactoring : Removed unncessary imports and commented code
Refactoring : moving classes to correct packages
Refactoring: removed page lisener as its unused class