Fixed ImportErrors / package structure
Merged