Re-organized folders into categories