Moved some files around, changes to adder.