Moved some stuff into TConstruct module