Moved some files, minor cleanup