renamed folders to standard ones