Alfred done

Moved some things.