Moved to folders to clean up URLs