Fix: add files to project and make it work