PublicAPI - Folder Refactoring