Try to fix #2
Cleanu and refactor directory a bit