Moved stuff into files and deleted a few files