Final redo(hopefully)

Complete folder structure included.  Hopefully this will be what's needed.