Moved stuff out of spec repo