Fix files organization