Directory changes
Revert "Directory changes"

This reverts commit 53e8a7ca9b0a8285ca9141faac692ef7f62ef083.
Refactored modules
Refactored service
Refactored directory structure