Refactoring repo to discuss #1 and iilab/openoil#32
Added @pudo and @elf-pavlik's suggestions from iilab/openoil#32. @sebbacon might want to join in.