Fixed relative importing issue
Fixed some other extension/relative path issues