I have developed a WordPress plugin that is now live on the WordPress Plugin Directory. However, I'm facing an issue with managing different folder structures between my development environment and the structure required for deployment on WordPress.

Current Setup My development branch (dev) has the following folder structure:

**my-plugin**
 /included
 /admin
 my-plugin.php

Current Setup My development branch (main) has the following folder structure:

**my-plugin**
/assets  
/trunk  
 ~The trunk folder contains all the main plugin files, including PHP files

The Problem
The folder structures between the development and deployment branches are different. When I prepare a new release, I need to manually adjust the file structure, which is time-consuming and error-prone. Directly merging the dev branch into main doesn’t work because of the folder mismatch.

Any guidance, examples, or resources would be greatly appreciated!