* Moved around functions to make script easier to read
* Renamed and reworked logic around package types and extensions