File restructuring; more granular for easier management.