Clean up old file structure