Refactor the entire manifest