diff --git a/CHANGES.txt b/CHANGES.txt
index 5e6abb6..facdaa7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+Changes in V3.0.3 since V3.0.2
+
+* XMLBEANS-527: Rename shell script directory, to align on typical directory layout
+
 Changes in V3.0.2 since V3.0.1
 
 * XMLBEANS-520: wrong name for source(s) artifact
diff --git a/bin/_setlib b/src/shell/_setlib
similarity index 100%
rename from bin/_setlib
rename to src/shell/_setlib
diff --git a/bin/_setlib.cmd b/src/shell/_setlib.cmd
similarity index 100%
rename from bin/_setlib.cmd
rename to src/shell/_setlib.cmd
diff --git a/bin/dumpxsb b/src/shell/dumpxsb
similarity index 100%
rename from bin/dumpxsb
rename to src/shell/dumpxsb
diff --git a/bin/dumpxsb.cmd b/src/shell/dumpxsb.cmd
similarity index 100%
rename from bin/dumpxsb.cmd
rename to src/shell/dumpxsb.cmd
diff --git a/bin/inst2xsd b/src/shell/inst2xsd
similarity index 100%
rename from bin/inst2xsd
rename to src/shell/inst2xsd
diff --git a/bin/inst2xsd.cmd b/src/shell/inst2xsd.cmd
similarity index 100%
rename from bin/inst2xsd.cmd
rename to src/shell/inst2xsd.cmd
diff --git a/bin/scomp b/src/shell/scomp
similarity index 100%
rename from bin/scomp
rename to src/shell/scomp
diff --git a/bin/scomp.cmd b/src/shell/scomp.cmd
similarity index 100%
rename from bin/scomp.cmd
rename to src/shell/scomp.cmd
diff --git a/bin/scopy.cmd b/src/shell/scopy.cmd
similarity index 100%
rename from bin/scopy.cmd
rename to src/shell/scopy.cmd
diff --git a/bin/sdownload b/src/shell/sdownload
similarity index 100%
rename from bin/sdownload
rename to src/shell/sdownload
diff --git a/bin/sdownload.cmd b/src/shell/sdownload.cmd
similarity index 100%
rename from bin/sdownload.cmd
rename to src/shell/sdownload.cmd
diff --git a/bin/sfactor b/src/shell/sfactor
similarity index 100%
rename from bin/sfactor
rename to src/shell/sfactor
diff --git a/bin/sfactor.cmd b/src/shell/sfactor.cmd
similarity index 100%
rename from bin/sfactor.cmd
rename to src/shell/sfactor.cmd
diff --git a/bin/svalidate b/src/shell/svalidate
similarity index 100%
rename from bin/svalidate
rename to src/shell/svalidate
diff --git a/bin/svalidate.cmd b/src/shell/svalidate.cmd
similarity index 100%
rename from bin/svalidate.cmd
rename to src/shell/svalidate.cmd
diff --git a/bin/validate b/src/shell/validate
similarity index 100%
rename from bin/validate
rename to src/shell/validate
diff --git a/bin/validate.cmd b/src/shell/validate.cmd
similarity index 100%
rename from bin/validate.cmd
rename to src/shell/validate.cmd
diff --git a/bin/xpretty b/src/shell/xpretty
similarity index 100%
rename from bin/xpretty
rename to src/shell/xpretty
diff --git a/bin/xpretty.cmd b/src/shell/xpretty.cmd
similarity index 100%
rename from bin/xpretty.cmd
rename to src/shell/xpretty.cmd
diff --git a/bin/xsd2inst b/src/shell/xsd2inst
similarity index 100%
rename from bin/xsd2inst
rename to src/shell/xsd2inst
diff --git a/bin/xsd2inst.cmd b/src/shell/xsd2inst.cmd
similarity index 100%
rename from bin/xsd2inst.cmd
rename to src/shell/xsd2inst.cmd
diff --git a/bin/xsdtree b/src/shell/xsdtree
similarity index 100%
rename from bin/xsdtree
rename to src/shell/xsdtree
diff --git a/bin/xsdtree.cmd b/src/shell/xsdtree.cmd
similarity index 100%
rename from bin/xsdtree.cmd
rename to src/shell/xsdtree.cmd
diff --git a/bin/xstc b/src/shell/xstc
similarity index 100%
rename from bin/xstc
rename to src/shell/xstc
diff --git a/bin/xstc.cmd b/src/shell/xstc.cmd
similarity index 100%
rename from bin/xstc.cmd
rename to src/shell/xstc.cmd