Moving some files around for cleanliness