Source tree cleanup
Code refactoring
Update Makefile
Inline makeT in non-dep-typed implementation