Cleaned up some configs, moved some MORE DAMN FILES AROUND