Move to new source folder and update references