Updated scripts and main to accomodate a new folder organization