Changes due to repo rename and main tidy up