fake file tree, good wizard of oz stuff
fixed merge conflcits
fixed more merge conflicts