Fedora nodes refactor

https://www.pivotaltracker.com/story/show/79487204
@ajs6f : https://www.pivotaltracker.com/story/show/79606006