Organized all the folders properly