Rearranged files according to convention