Rename + remove excess file structure.