Restructored for automated build platform