Fixed some import issue with nested classes