Make imports work when in .sublime-package
Fix problems when rearranging

I'm 100% sure I fixed these already, must've gotten lost somewhere.
Less debugging