Hopefully the right directory layout this time...