Factored out unified structure code into separate asdf.  Other cleanup

See ChangeLog file for details