File and Namespace Reorg