Code cleanup
Added the extra-copies and extra-dirs
Raised version