Comment out guards
Move libmutex back to the right place...
Remove SCONS/Make files
Update MakeFiles again
Revert for now