Restructure code for feedback session questions (Java code) #2739

Fixes #2739 

Restructure java code for feedback questions