this directory structure is retarded. we're not using this.
reorganizing to make things sane