Fix documentation
Improve dependencies and move classes