Changing directory structure

This will allow easier automated deployment and probably leads to less confusion.