Changes in import related to folder re-naming.