Remove unused import
Remove Node class
Moved some files around
Update tests