directory structure update to integrate with the main repo