File re-org + More specs.