Restructured the app a bit. Working on giving it a generic command line interface.