Dev. checkpoint: Touchups: Files renamed