renamed folders to improve order