Moved collections into folder and renamed accordingly.