WIP files and folder stuff

this is not a "I want you to pull this in as-is" request, it's just so you know where I'm at on this.