Move to folders. Change namespace.