Moved some files around, added some newlines to io