redid folder hierarchy. very close to release version.