Refactor to fit with installation package

Refactor to fit with the new installation package directory structure