Add single objects to project

 structure the main file such that only logic
 is contain in it.
 All declarations and implementations go to single modules
Remove all declarations from main file
Merge branch 'master' of https://github.com/oz123/coll2tde

Conflicts:
	Makefile