Issue #1

Fixing issue #1 bugs. Mainly setting classes to new style and correcting a logic bug, where a set execution folder would be ignored.