Refactor and cleanup of transfer and gui search layer.