Seems to be the way, "cleaning and organizing" go. Once I start moving "stuff" around and wishing I had more room/floor space, I realize the best way to do that is put the danged parts on the car...
You made good progress.
Protect Marty's ears around vehicles with open headers. It is far easier than people realize to damage hearing in children as they are developing.