Clean up

Moved FinalMotif to top level