Cleaning up more, adding folders.