finally cleaned it all out and moved the last of CanJs to a header folder