Renamed two folders to get in good shape the namespace.