v1.0.0 Fixed cross imports