Fixed some imports and package name areas