Files re-organization