Redid the folder hierarchy
Let us release that way