Re-arranged editor files