Some directory restructuring and more clean-up