Refactored project structure and added pagination
Added todo