Fixing and adding necessary files