Reverts and fixes breakout file bug
Adds missing option to install modules
Merge branch 'refactor-files'

Conflicts:
	setup.py