Rename Messages/Message to Index and Test/Test to Test/Index