Files structure reorganized.