removed redundant files and corrected imports