Changed URL variables to use package name as directory
Updated script structure