Fix Chisel and folder structure rework

Yes...A lot of commits due to Git not being able to handle everything.