Make it actually work with the new directory structure..