Rearrange files a bit for a better structure.