Use newly added folder.parent
Improve readability
Add more FIXME's