Rearranging file structure for work with Bonnie! =D"