Restructure file layout
Added message fetching