Finish Rebuild

Jason Nagyrequested to merge
rebuild into master

Rebuild of project structure so install process does not involve editing an existing extension.

Merge request reports