restructure
moving some more files
finishing merge personalities; fixed to work with the new codebase, should be last modification to Automation fns