Cleanup tree structure
Merge branch 'master' of github.com:Krzysztow/hadoop