clean the file structure
Merge https://github.com/TamerTas/Abaddon