Improved directories structure and naming