Fedora nodes refactor

https://www.pivotaltracker.com/story/show/79487204