Improved sprite loading and cleaned up some files