Moved from nested to root files structure