Swri internal mods

This branch includes SwRI internal modifications and new move it packages.