Moving imports from render to common