Revert "Comments and removed folders stuff"

This reverts commit 50dcfaf035607eda14039553327dcdac90462a2f.
Fixed things