Moved a few files and methods around etc.