Started moving nodes to seperate files.
Cleanup