Some cleanup + renaming
Improved extraction script
Lots of improvements