Added private data class design pattern. Folder refactoring