* commit '9158825f9c41869689d6b1786d7c7aa8bdd524ce': Move some system services to separate directories