reorganized node folder & added message count limit