Rename driver file, refactor to organize private methods