6,madigan6: Refactored packaging, moved list adapters, deleted unused files
Merge branch 'master' into meyer30