Merge "Create custom directory for sockets"