Updated tupfiles, removed old Makefiles. Build system seems to work much better.