Added namespace and single files.