Cleaned up directories and namespaces for window template.