File structure reorganize