diff --git a/Scripts/Bash/Functions/Tuneup/Sh/Config/topcomment.sed b/Scripts/Bash/Functions/Tuneup/Sh/Config/topcomment.sed
new file mode 100644
index 0000000..0b3077f
--- /dev/null
+++ b/Scripts/Bash/Functions/Tuneup/Sh/Config/topcomment.sed
@@ -0,0 +1,55 @@
+#!/bin/sed
+#
+# topcomment.sed -- This file standardizes the top comment inside
+# centos-art.sh scripts.
+#
+# Copyright (C) 2009, 2010, 2011 The CentOS Artwork SIG
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# ----------------------------------------------------------------------
+# $Id$
+# ----------------------------------------------------------------------
+/^# +Copyright .*$/a\
+# Copyright (C) =COPYRIGHT_YEAR_LIST= =COPYRIGHT_HOLDER=\
+#\
+# This program is free software; you can redistribute it and/or modify\
+# it under the terms of the GNU General Public License as published by\
+# the Free Software Foundation; either version 2 of the License, or (at\
+# your option) any later version.\
+#\
+# This program is distributed in the hope that it will be useful, but\
+# WITHOUT ANY WARRANTY; without even the implied warranty of\
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\
+# General Public License for more details.\
+#\
+# You should have received a copy of the GNU General Public License\
+# along with this program; if not, write to the Free Software\
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\
+#\
+# ----------------------------------------------------------------------
+
+# Remove previous copyright notice, just to be sure the one above be
+# used always.
+/^# +Copyright .*$/,/^# -{70}$/{
+d
+}
+
+# Remove more than one space after comments.
+s/^# +/# /
+
+# Define script first line.
+1c\
+#!/bin/bash
diff --git a/Scripts/Bash/Functions/Tuneup/Sh/shell.sh b/Scripts/Bash/Functions/Tuneup/Sh/shell.sh
new file mode 100755
index 0000000..da719b2
--- /dev/null
+++ b/Scripts/Bash/Functions/Tuneup/Sh/shell.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# shell.sh -- This function standardizes maintainance tasks for Shell
+# script files.
+#
+# Copyright (C) 2009, 2010, 2011 The CentOS Project
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# ----------------------------------------------------------------------
+# $Id$
+# ----------------------------------------------------------------------
+
+function shell {
+
+    # Rebuild top comment inside shell scripts, mainly to update
+    # copyright information.
+    shell_doTopComment
+
+}
diff --git a/Scripts/Bash/Functions/Tuneup/Sh/shell_doTopComment.sh b/Scripts/Bash/Functions/Tuneup/Sh/shell_doTopComment.sh
new file mode 100755
index 0000000..259e948
--- /dev/null
+++ b/Scripts/Bash/Functions/Tuneup/Sh/shell_doTopComment.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# shell_doTopComment.sh -- This function standardizes the top comment
+# section inside shell scripts (*.sh) using a predefined template.
+#
+# Copyright (C) 2009, 2010, 2011 The CentOS Project
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# ----------------------------------------------------------------------
+# $Id$
+# ----------------------------------------------------------------------
+
+function shell_doTopComment {
+
+    # Define absolute path to template file.
+    local TEMPLATE="${TUNEUP_CONFIG_DIR}/topcomment.sed"
+
+    # Check template file existence.
+    cli_checkFiles $TEMPLATE
+
+    # Define file name to template instance.
+    local INSTANCE=$(cli_getTemporalFile $TEMPLATE)
+
+    # Create template instance.
+    cp $TEMPLATE $INSTANCE
+
+    # Check template instance. We cannot continue if template instance
+    # couldn't be created.
+    cli_checkFiles $INSTANCE
+
+    # Expand translation markers in template instance.
+    cli_expandTMarkers $INSTANCE
+
+    # Apply template instance to file.
+    sed -r -i -f $INSTANCE $FILE
+
+    # Remove template instance.
+    if [[ -f ${INSTANCE} ]];then
+        rm ${INSTANCE} 
+    fi
+
+}
diff --git a/Scripts/Bash/Functions/Tuneup/Shell/Config/topcomment.sed b/Scripts/Bash/Functions/Tuneup/Shell/Config/topcomment.sed
deleted file mode 100644
index 0b3077f..0000000
--- a/Scripts/Bash/Functions/Tuneup/Shell/Config/topcomment.sed
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sed
-#
-# topcomment.sed -- This file standardizes the top comment inside
-# centos-art.sh scripts.
-#
-# Copyright (C) 2009, 2010, 2011 The CentOS Artwork SIG
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-/^# +Copyright .*$/a\
-# Copyright (C) =COPYRIGHT_YEAR_LIST= =COPYRIGHT_HOLDER=\
-#\
-# This program is free software; you can redistribute it and/or modify\
-# it under the terms of the GNU General Public License as published by\
-# the Free Software Foundation; either version 2 of the License, or (at\
-# your option) any later version.\
-#\
-# This program is distributed in the hope that it will be useful, but\
-# WITHOUT ANY WARRANTY; without even the implied warranty of\
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\
-# General Public License for more details.\
-#\
-# You should have received a copy of the GNU General Public License\
-# along with this program; if not, write to the Free Software\
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\
-#\
-# ----------------------------------------------------------------------
-
-# Remove previous copyright notice, just to be sure the one above be
-# used always.
-/^# +Copyright .*$/,/^# -{70}$/{
-d
-}
-
-# Remove more than one space after comments.
-s/^# +/# /
-
-# Define script first line.
-1c\
-#!/bin/bash
diff --git a/Scripts/Bash/Functions/Tuneup/Shell/shell.sh b/Scripts/Bash/Functions/Tuneup/Shell/shell.sh
deleted file mode 100755
index da719b2..0000000
--- a/Scripts/Bash/Functions/Tuneup/Shell/shell.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# shell.sh -- This function standardizes maintainance tasks for Shell
-# script files.
-#
-# Copyright (C) 2009, 2010, 2011 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function shell {
-
-    # Rebuild top comment inside shell scripts, mainly to update
-    # copyright information.
-    shell_doTopComment
-
-}
diff --git a/Scripts/Bash/Functions/Tuneup/Shell/shell_doTopComment.sh b/Scripts/Bash/Functions/Tuneup/Shell/shell_doTopComment.sh
deleted file mode 100755
index 259e948..0000000
--- a/Scripts/Bash/Functions/Tuneup/Shell/shell_doTopComment.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-#
-# shell_doTopComment.sh -- This function standardizes the top comment
-# section inside shell scripts (*.sh) using a predefined template.
-#
-# Copyright (C) 2009, 2010, 2011 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function shell_doTopComment {
-
-    # Define absolute path to template file.
-    local TEMPLATE="${TUNEUP_CONFIG_DIR}/topcomment.sed"
-
-    # Check template file existence.
-    cli_checkFiles $TEMPLATE
-
-    # Define file name to template instance.
-    local INSTANCE=$(cli_getTemporalFile $TEMPLATE)
-
-    # Create template instance.
-    cp $TEMPLATE $INSTANCE
-
-    # Check template instance. We cannot continue if template instance
-    # couldn't be created.
-    cli_checkFiles $INSTANCE
-
-    # Expand translation markers in template instance.
-    cli_expandTMarkers $INSTANCE
-
-    # Apply template instance to file.
-    sed -r -i -f $INSTANCE $FILE
-
-    # Remove template instance.
-    if [[ -f ${INSTANCE} ]];then
-        rm ${INSTANCE} 
-    fi
-
-}