finished restructuring, cleaned dirs