Split out features section, like the others.
Clean a bit more. TODO: figure out how to clean files recursively in a neat way.