Rearranging code so that it is easier to read, also some minor tweaks to the create subscription action
Enabling war file generation