Clean up old files, consolidate files