Nii - WIP some new folder structures and in the process of porting over scripts to ruby script for now