Moved scripts and source around to be better organised