and some more directory structure changes
added correct upload dir to make deploy