rename files for better structure