Improved Tags and Package structure refs #2499