Folder organization and web improvements