Restructuring to allow installation