standardised file names and corrected imports