Move some directories around, change a few small things