Added scripts and updated structure