Fix some file paths that were created in the wrong way and clean up some unused code