Updated the code position

Separated out all of the code into the appropriate files.  Now that it
is MEF based it no longer needed to be in the same files and could be
separated out to the appropriate locations in the code