restructured test source to mirror production source layout