Moving some files around and adding array swap test