Finishes refactoring manifest class