Moved around files, improved data collection scripts.