Restructure folder structure to better manage release.

Restructure folder structure to better manage release.