diff --git a/.gitignore b/.gitignore
index 7e2035440d69cb3fd2ef738336928fa4f42a1231..40419f786665af405e8c07f37a56f91a180f53d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,40 +1,21 @@
-.gitignore
-.libs
-*.o
-*.d
-*.la
-*.lo
-*.so.*
-*.so
-*.pyc
-*.bak
 *~
-*.moc
-*.xml
-.*project
-gsoap/*
-client/srm2_*
-srm/admin/*area
-srm/daemon/srmbed
-srm/server/srmfed
-*testOCCI*
-*testCastor*
-Makefile
-imake/*
-castor/gc/Makefile
+*.bak
 castor/gc/gcd
+castor/gc/Makefile
 castor/infoPolicy/Makefile
-castor/job/Makefile
-castor/job/d2dtransfer/Makefile
 castor/job/d2dtransfer/d2dtransfer
+castor/job/d2dtransfer/Makefile
+castor/job/Makefile
+castor/jobmanager/jobmanagerd
+castor/jobmanager/Makefile
 castor/job/stagerjob/Makefile
 castor/job/stagerjob/stagerjob
-castor/jobmanager/Makefile
-castor/monitoring/Makefile
 castor/monitoring/admin/Makefile
 castor/monitoring/admin/rmAdminNode
 castor/monitoring/checkSharedMemory
 castor/monitoring/dumpSharedMemory
+castor/monitoring/fillSharedMemory.cpp
+castor/monitoring/Makefile
 castor/monitoring/rmGetNodes
 castor/monitoring/rmmaster/Makefile
 castor/monitoring/rmmaster/rmmasterd
@@ -43,68 +24,24 @@ castor/monitoring/rmnode/rmnoded
 castor/repack/Makefile
 castor/repack/repack
 castor/repack/repackd
+castor/rh/rhd
 castor/rtcopy/mighunter/Makefile
 castor/rtcopy/mighunter/mighunterd
 castor/rtcopy/rechandler/Makefile
 castor/rtcopy/rechandler/rechandlerd
 castor/scheduler/Makefile
 castor/stager/daemon/stagerd
-clips/Makefile
-codeGeneration/gencastor/gencastor.bin
-codeGeneration/gencastor/kdesdk-3.5.10
-dlf/web/Makefile
-expert/expertd
-gridftp2/Makefile
-gridftp2/external/Makefile
-gridftp2/internal/Makefile
-gridftp2/xroot/Makefile
-hsmtools/stager_actualget
-hsmtools/stager_actualput
-logprocessor/Makefile
-ns/nsdelsegment
-ns/nsrmvid
-rmc/rmcd
-tape/dumptape
-test/castor/Makefile
-tools/MagicNumbers
-tools/MagicNumbers.ps
-upv/Cupv_oracle_ifce.c
-upv/Cupv_oracle_ifce.lis
-upv/Cupvadd
-upv/Cupvcheck
-upv/Cupvdelete
-upv/Cupvlist
-upv/Cupvmodify
-upv/cupvd
-castor/jobmanager/jobmanagerd
 castor/tape/mighunter/mighunterd
 castor/tape/rechandler/rechandlerd
-castor/monitoring/fillSharedMemory.cpp
 castor/tape/tapebridge/tapebridged
-client/src/stager/stager_abort
-hsmtools/rfcpupd.c
-rtcopy/rtcpc_CallVMGR.c
-rtcopy/rtcpc_CheckReq.c
-rtcopy/rtcpc_SendRecv.c
-rtcopy/rtcpc_log.c
-tape/usrlocate.c
-tape/usrreadlbl.c
-tape/usrrwndtape.c
-tape/usrskiptape.c
-tape/usrsmcsubr.c
-tape/usrsmcsubr2.c
-tape/usrtperror.c
-tape/usrusrmsg.c
-tape/usrwritelbl.c
-tape/usrwrttpmrk.c
-vdqm/vdqmc_SendRecv.c
-castor/rh/rhd
 castor/tape/tapegateway/tapegatewayd
 castor/tape/tpcp/dumptp
 castor/tape/tpcp/readtp
 castor/tape/tpcp/writetp
 castor/vdqm/vdqmd
+castor/vdqm/vdqmDBInit
 client/src/stager/castor
+client/src/stager/stager_abort
 client/src/stager/stager_addprivilege
 client/src/stager/stager_get
 client/src/stager/stager_listprivileges
@@ -115,6 +52,19 @@ client/src/stager/stager_removeprivilege
 client/src/stager/stager_rm
 client/src/stager/stager_setfilegcweight
 client/src/stager/stager_update
+client/srm2_*
+clips/Makefile
+codeGeneration/gencastor/gencastor.bin
+codeGeneration/gencastor/kdesdk-3.5.10
+*.d
+dlf/web/Makefile
+expert/expertd
+.gitignore
+gridftp2/external/Makefile
+gridftp2/internal/Makefile
+gridftp2/Makefile
+gridftp2/xroot/Makefile
+gsoap/*
 hsmtools/adler32
 hsmtools/c2probe
 hsmtools/deleteFileClass
@@ -128,7 +78,17 @@ hsmtools/modifyFileClass
 hsmtools/modifySvcClass
 hsmtools/reclaim
 hsmtools/rfcpupd
-castor/vdqm/vdqmDBInit
+hsmtools/rfcpupd.c
+hsmtools/stager_actualget
+hsmtools/stager_actualput
+imake/*
+*.la
+.libs
+*.lo
+logprocessor/Makefile
+Makefile
+*.moc
+nbproject
 ns/Cns_oracle_ifce.c
 ns/Cns_oracle_ifce.lis
 ns/nschclass
@@ -137,6 +97,7 @@ ns/nschown
 ns/nsd
 ns/nsdelcomment
 ns/nsdeleteclass
+ns/nsdelsegment
 ns/nsenterclass
 ns/nsfind
 ns/nsgetacl
@@ -151,12 +112,16 @@ ns/nsping
 ns/nsrename
 ns/nsrm
 ns/nsrmdir
+ns/nsrmvid
 ns/nssetacl
 ns/nssetchecksum
 ns/nssetcomment
 ns/nssetfsize
 ns/nssetsegment
 ns/nstouch
+*.o
+.*project
+*.pyc
 rfio/rfcat
 rfio/rfchmod
 rfio/rfcp
@@ -166,18 +131,33 @@ rfio/rfmkdir
 rfio/rfrename
 rfio/rfrm
 rfio/rfstat
+rmc/rmcd
 rtcopy/killjid
 rtcopy/migrator
 rtcopy/recaller
+rtcopy/rtcpc_CallVMGR.c
+rtcopy/rtcpc_CheckReq.c
 rtcopy/rtcpclientd
+rtcopy/rtcpc_log.c
+rtcopy/rtcpc_SendRecv.c
 rtcopy/rtcpd
 rtcopy/tperrhandler
 rtcopy/tpread
 rtcopy/tpwrite
+*.so
+*.so.*
+srm/admin/*area
+srm/daemon/srmbed
+srm/server/srmfed
 tape/confdrive
+tape/dumptape
 tape/mounttape
+tape/mounttape-nostk
+tape/mounttape-stk.c
 tape/posovl
+tape/rbtsubr-stk.c
 tape/rlstape
+tape/rlstape-nostk
 tape/smc
 tape/taped
 tape/tpconfig
@@ -185,11 +165,33 @@ tape/tpdump
 tape/tplabel
 tape/tprstat
 tape/tpstat
+tape/usrlocate.c
+tape/usrreadlbl.c
+tape/usrrwndtape.c
+tape/usrskiptape.c
+tape/usrsmcsubr2.c
+tape/usrsmcsubr.c
+tape/usrtperror.c
+tape/usrusrmsg.c
+tape/usrwritelbl.c
+tape/usrwrttpmrk.c
+*testCastor*
+test/castor/Makefile
+*testOCCI*
 test/unittest/rununittests
+tools/MagicNumbers
+tools/MagicNumbers.ps
+upv/Cupvadd
+upv/Cupvcheck
+upv/cupvd
+upv/Cupvdelete
+upv/Cupvlist
+upv/Cupvmodify
+upv/Cupv_oracle_ifce.c
+upv/Cupv_oracle_ifce.lis
 vdqm/showqueues
 vdqm/vdqm_admin
-vmgr/vmgr_oracle_ifce.c
-vmgr/vmgr_oracle_ifce.lis
+vdqm/vdqmc_SendRecv.c
 vmgr/vmgrd
 vmgr/vmgrdeletedenmap
 vmgr/vmgrdeletedgnmap
@@ -214,5 +216,7 @@ vmgr/vmgrlisttape
 vmgr/vmgrmodifylibrary
 vmgr/vmgrmodifypool
 vmgr/vmgrmodifytape
+vmgr/vmgr_oracle_ifce.c
+vmgr/vmgr_oracle_ifce.lis
 vmgr/vmgrsettag
-nbproject
+*.xml