[REF] Restructure files
[REF] Restructure files