JWT: refactored project structure to be similar to modular