Files updates for better structure