[Thor] Refactored the directory tree