manifest refactoring
Merge pull request #12 from loky9000/refactoring

manifest refactoring