Removed unused import
Moved some libs
v2.1.6