Have begun sorting the folders out and am moving all the actions to be together as they are spread out at the moment. Am doing minor refactoring based upon if variables are required to be in scope at class level or not and other simple checks.
Moving more actions over and extracting more encapsulated extension methods for re-use and possibly testing going forwards.
Have moved all the other actions into the main actions folder and extended on some of the extension methods wherever possible.