Move mapper to self-owned directory