Reverted the addition of _header and _footer.  Each file is now wrapped with an IIF that separates it from the global namespace.