reorganized files quite a bit