putting in a new dir structure & organizing