Addition and changes made after moving to DBC folder