Moved more files around

Just trying everythign now