Refactoring for easier packaging process.