moving stuff around into a include directory