Changed file names, added define for authenticate