Moved some stuff.
Made some changes.