Simplified
Renamed nb files