reorganized directories, did some number crunching
reorganized dirs