rename dir and sln, modify makefile