major overhaul of directory structure based on workig sess.