HSQL database deployed. Some refactoring