Restructured project for installer