Fixed Makefile to work with reorganization, as per John's suggestions, and added the beginnings of Test3DPlayer