Restructure directories (to make nicer pancakes)