Test module system
Code review

Conflicts:
	main.c
Fixing windows build.