Restructured code.
Merge remote-tracking branch 'github/master'

Conflicts:
	defs.h
	main.cu