More files moved to java_axistools