project structure rearranged, messages administration added XOXOXO