Resolve "Update source code" Part 1

Relates #48 (closed)

This merge request updates source code for modules concerning TC-1 to TC-4 (bonus included) Other modules will be updated in a future merge request