Changed some includes so we don't need all OF includes, and can have non-standard directories