Massive refactoring and some additions

Graphite, some ELK states, moving files around. Sorry about single
commit.