updated dirs to follow new structure