Moving editor sources back into trunk