[master] Move code