Simplified structure of modules.
Merge branch 'master' of https://github.com/tuxbert/blackbox

Minor changes to inputs.

Conflicts:
	core.py