Reorganize files a little bit