Added a template architecture plug-in
Added tests for the template architecture plug-in as well
Default to the "flat" file format
Unifying the test scripts
Code cleanup
Unifying the tests