making folder structure better.