Improve directory structure to reduce duplication and streamline testing and development