Moved/renamed bridging header; stopped hardcoding paths