Re-arranging spec code in preparation

DLTP-56 #development