Rearranging and refactoring some things, general cleanup ;)
Forgot to remove the old classes in the last commit also I cleaned up the SCEP controller, splitting the actions and removing the failure case