Converted scripts into package

As discussed...