Moved around some files

Not sure if this is very standard, but it works for what I want