Sort folders and removes unused implements statement