FIXED: Wrong #ifdef
Moved coordinate conversions into separate files