Moved some files and a little more