Started modularizing eps

Mostly finishes issues #7 and #8