Moved some stuff around, some small modifications
Fixed scripts to match the rearrangement I just did