Several improvements in code
Now you just need one file