Restructure a bit

I tried to use -include in CT_OPTS, but I wasn't having any luck.