reorganizing wasn't complete yet

It is now.   Sometimes it make sense to test your code.  :-/