Reorganisation (again) plus init script