Moved some files in the project to be more efficient.