Structuring fs
Merge branch 'master' of https://github.com/jan-issac/state_filtering