Changed names, removed unneccessary OMR folder.