Clean architecture refactor

Refactor codebase with clean architecture for better modularity and separation