Files structure reorganize