Clearer files organization