Refactor manifest structure