Moved resource messages to proper place