Sorting out the folder making it more clear