Fix for files structure and details