Got rid of some old files and moved stuff around