restructing files and file names for usability.