LDEV-2866
* Got rid of duplicative jsp parts in Ozgur's tools
* Some initial refactoring of the code
* Got rid of duplicative jsp parts in Ozgur's tools
* Some initial refactoring of the code