Moving some files around, adding requirements