Updates and file reorganization