Some more cleanup for new directory structure