Moving around a lot of files to work towards production components.