Files structure changed a bit