Nii - some folder restructuring and clean up