Next step of refactoring

All changes were successfully tested on Ubuntu and MacOSX with the new test suite.
(assembly/src/test/sh/init-script-testsuite)