Move 'message' folder out of models