Moved things into Filigree namespace as appropritate.
Removed an unnecesary namespace declaration.