Fix wrong paths. Added some new files.