reorganizing files a bit