Finish reorganizing; finished ps4a
Getting close