Move recent changes to proper place