Changing the public folder structure

Changing the public folder structure in order to have better folder
names for the public folders before copying them.