Refactored code and removed module dependency to GXT 2.2.5