Fixed import path problems