Restructured to remove build bug