Updated structure to reflect previous version