Restore class structure, add folders.