Some refactoring
Merge branch 'master' of github.com:phyper/FlatOrganizer