Moved more files

I did some organizing