Moved plugin tools to tools subdirectory
Fixed imports