Also added in Fire Charge Cannon & some enchants last commit =P. Renamed a folder 2