Refactoring and QueryDSL tools and configuration added