re-organized directories based on our universal dir structure
1.4.17