Split the upload form into two controllers and test

A controller to handle the file upload that communicates its result to the general form controller to act on.
Include required plugin files