Move placeholder users and clients to their own modules