Simplify classes for calling Flux

I have quickly refactored some of your classes to simplify calling Flux. I hope you don't mind my changes and going to merge this pull request. :)