reorganize files a bit