updated and organized folders