renamed and moved potentially unneccesary files