reorganized files a bit