Some minor restructuring of code...
Minor clean up + download and convert functionality are finished.