Adjusting to use classpath based layout by default