Rename messages.js to common/messages.js