Little bit of renaming and sanity-check for Sockets-directory

Signed-off-by: Malric <malricdal@gmail.com>
Merge branch 'master' of github.com:Malric/NMPS