h2xs - new directory structure?