rename some classes and sort files in folders