changed the file structure so that stuff would hopefully build again.