Added response generator
Refactored and moved code
Corrected plugin loading