Refactor manifest file, make it more logical