Set up new directory structure