Restructured the oneMore file