Refactoring to get ready for script packs #22
Refactoring to get ready for script packs #22