Moved users and rooms into json and added controllers