Tidy up Sources and rename