refactoring
rename folder stuff to directory, finally
and now we begin the overhaul in earnest