Restructuring from application to wrapper

First step in turning this into a tool instead of a full blown application.