Updated folder structure (better navigation, better replacement, better logic and better hammer output)