Using the new OAT file structure

Also various fixes to bugs found while testing file structure changes.
Updates to template files
Latest Plugin Deployment Build: 0.0.512

Changed for latest OAT file structure.