Moved things and fixed stuff up.